Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 24 Jan 2010 21:58:18 +0000 (21:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 24 Jan 2010 21:58:18 +0000 (21:58 +0000)

Trivial merge